More smart code completion