switched back to MySql and completed Entity class refactoring