Updated for file types