Added GAPConfig and GAPPanel