Refactoring and handling multiple schema with object filters