Refactor put schema related objects in validation.schema