Add initial support for type taggin