Complete user-defined file types feature
Bug fixes for user-defined file types