Change command format and added requirements