Apache improvements