Fixed quotes problem, refactored custom attributes