Feature/add completion