Updated apache, fixed deprecated class