Added metadata and handling of orphaned states