- Migrate to apache 2.4