Add completion support