Code Completion modifications