Added configurable templates