Add more code completion