Resolve IP refactor, improved dialog handling