Update Item && Block to use new API