Introduce new table - mappings and adapt database