[fix] Added missing domains handling