Add some logic on new case creation #291