Yep, I can take care of this... at least until the API will be enough stable...