Adding custom attribute support

Forgot to reenable after fixing the specs... Thx, for noticing.