Added new classes (utils)