Version 2.2 refactoring, Rhea support