More work on custom block support