Convert loader to promises
saver moved to promises