remove complexity in mapping actor class