Tightened up domain objects