Add ExtendTag and BlockTag.. Cleaned up Parser::Data