Add rem support back to the framework