API key override ability added