Added support for new RN table structure