More code completion work