Add completion feature