Sequelize expand/include support + refactoring