Added template support
Added template support