Refactored commands. Added extra options. Created CommandParser map