Spruced up Domain Model