Continuing conversion to EF

Changed lists to ICollections - now lazy loading works on private
fields.