Added dynamic template