Change template and added definition