Feature/club 120 migrate fields

Please merge my earlier PR first. This PR depends on it and contains the same commits.