Updated wrap to use hybrid_attr