Updating domain support on 3.6.11