Added parser and some more in the angular class