Adding more support for parsing