Refactor json response for block api; add additional blocks to schema