#23058303240603 Change FitClubsBundle to higher abstraction