Add BWSingletons which will contain most, if not all, singleton variables.