Added basic support for parsing tags