Partial support for v1.5 blocks