Made Objects pure, split some stuff of PostgreSQL into Storage