added Citadel support