added parsing of command vars