Updated Model to provide consistent change events