Add udf recognition
Add UDF files
Fix merge conflict