Added File Type and Cell Subset for Better Performance
Working on Templating