Universe module improvements