Refactored tabbing on attributes