Start using the InnoDB relations to improve the code quality