Added Apache Click support