Final Version of parser and modified Decorator