Moved current state of RI into separate module.