Improve automatic dependencies