Few more refactorings. Preparing everything for adding one more table!