Added more tags to supprt input