Housekeeping and added more model objects