Reimplemented loading & saving (reference issue)