Update for Apache 2.4