Removing constness on system and entity objects