Added a couple of new interfaces to the data model easier to extend.