Added get/set overloaders, fixed template injection