Support Composite's, not just structs