Improve path handling

Add unshift function to prepend values uniquely
Fix path