Updated CJ tools to use the new extensions.
File upload, lookup tables, value types-