Model changes to simplify processing