Update to basic schema