Added new way to parse command
New formats used