Updated with new renamed routes