Update to accept Domain in template