Refectored actor controller and service