Removed dependency on commons-lang3