refactor schema singletons