Removed dependency on commons-lang library