Added support of command parser