Simplified code, markers & locals saved in one storage