Improve Draper integration

This is for #2617.