Updated to DB, added groups table