Public API optimization by Joao Fernandes