Changed schema in preparation for delayed assignment