More variables exposed to templates
Wrappers improved