First progress in changing the ER model of the app