Added optimizer for various new file types