Support for optional columns, integration tests