more massaging, adding other core libs, code generator now consideres primary keys as we don't rely on single id fields anymore