Removed assumption of location and project name