applied pull request to upgrade api version and support custom data