More work on the multi-block API