Added draft for the completion framework