Changed parser to account for parameters starting with ":" separately