Adding Actors and Map[String, String] support