Fixed saving and loading entities to a semi-hacky solution