Added features needed for adopting 3.0 GUI change