Separate complete and command