Updated to follow recent changes in skema