Added more tags and mappings