Added PropertyTemplate