added missing libraries and some utility classes