Added Data and Core modules