Updated to match Apache version