Improve Draper integration proof-of-concept [ci skip]