Added template loading
Added Template loading