templates enhancement and new templates