Added support for Metadata Actors. Fixes