Reorganised Domain Model