Added actor support