Bug fix + add helper classes to build render array declaratively.