Extend exported interface to what we need in common use cases