template enhancement and renamed methods