improve actor generator (warning - doesn't take resolvers into account)