Improve actor implementation