support icarus instead of avalon