Refactored .Data into .Core