Support Zeus better