Updated actor class
Added TODO