Add completion support
Enhance complete algorithm