Update commands to use model