Small amends to model classes to support rules engine, neighbourhoods
and plant states