Updated code completion