Added initial completion support.