change mapping and relations in DB, use name to link model & battery to events