Actor updates to support SO