Complete the Apache part, need review