Added Safe Schema. No encryption
Updated TODO