Modified system classes, tests and add Utils