Updated with the new modularized uip paths