Added functionality for RSIDs and assembly mappers