Updated core files so that they run on the server