Implement descriptions for new inner product hierarchy
Adapt block factory
Adapt code at various places