Support for RXN, refactor classes