Added template include and remove requirement