Templates improvements