Modified some models to allow null entries.