update raw to use similar internal struct