api improvements
api improvements