Add a better code completion