Using package path made more robust