Implemented changed interface
Merge branch 'Storeable' into parallel
Implemented new interfaces
small bug fixed
Merge branch 'parallel' into proxy