Some Domain Logic changes