Changed: more explicit settings, less importing of schema