Adding defines modified for multi-instance