Added consistency with configuration