added support for block names + metadata