Refactoring Data module a bit