Updated framework to support RS3