Added utils & refactored Actors