Worked on EntitySaver