Refactoring default types and tags.