Some steps forward towards a better API