Added support for GerericSetup