Added cpsByMetaFields, so it can be chained with other build macros