Cosmetic changes in workspace list in resources parameters
Refactored template rendering with annotations
Submodule update