Prepare for full implementation of RNA