Updating ROME to use generics