Adding install path handling