Removed dependency on commons-lang