Updated Support beans