Improve RO and DS fetch and save performance by eliminating DB calls