Added parsing functions. No need of command.h