Added custom attr support