Started to implement isDirty logic