Use factories instead of build_attributes