Created new file for each type