Feature/api specs

@myabc Good point - I'll change it to around block.