Working on fixing the use of a different schema class name