Refactor FrontCommand