Added support for custom blocks