Nest some types under server