Cortoxa Data module refactoring