- Add associate class in NPL
 - Add Function in NPL

Some code clean up has been done as well (cosmetic change for the most)