Get rid of SchemaCell class, almost implemented the logic