Added template wrapping