FIX: Tag constructor refactoring