Updated block types

Block parameters updated to better reflect possible parameters to be passed to completion block as mentioned in #480