Latest changes in order to normalize the database structure