Update to be more directory independant