Removed dependency on Citizens