API wrapper improved
API wrapper improved again