Updated with Path changes
Fixed some issues