Added some utility classes on server side