Added data service and updated core.js structure