Added blocks for api
Merge branch 'dev'