Adding custom attribute support