fix layout/schema, implement operator