Removed Properties objects, fixed load and save.