Add more general modal agents