Finished implementing new file kinds