Improve comment, add IsDirty flag