Improve user-defined file types (incomplete)