improve templates and wrapped objects