Can we meet half way and at least keep $supported separate?