fixed types for multi domain support