There are a few places where we should do some overhaul on the existing API, before we go (close to) final
This epic is used to "group" all the things