Improved version of API - wip.