Some more group logic; Added migrations