Removed dependency on hibernate