Added some utilities and rename utility class