Adding modal support (resolve)