Added Citadel Base class