add USE_ELASTIC flag