Make modal more general