Refactor towards problem specific actors