HIgh level API improvements