Remove dependency on current working directory