Added custom attributes option