Added safeformat, uri and fsm.