Update for domain change and OpenNBT changes