Removed FieldCell abstraction