Refactor Tagged instances