Added more features to Parser
Final features of parser added