Minor changes in domain templates