Add more code to facilitate actor implementation