add helpers and adjust common templates