Adding extra templates to get extra functuinality