Refactored commands to follow with Emily-Core