+maxlinc +raquelguimaraes +taisediass +fernando-alves refactored api backwards compatibility