Auto Existing Coverage logic cleaned up