Update commands to be abstract