Changed the Object Model