Refactored custom attributes