Template changes and solved bugs
Functional resource editor & enricher