Initial implementation of instance completion