Updated with additional file types