Improved saving / loading to work on Web Player as well