Change to version less schema references