Minor changes, temporarily extracting abstract class for actors.