added dynamic templates