Updated with better structure for default path