Generic api

recreate pull request against generic