Updated modal usage