Renamed SaveHandler to ISaveHandler