Update proposed API

Inspired by an IRC chat with @os97673