[66390356] Using traits in factories instead of nested factories