Make it support CDI on both GAE and Local