Updated several classes to use the new POJO schemas