Add support for safe mode
Update roadmap