Improve ItemDataAdapter management