Fixed issue with models in modules & table names