Added new logic classes
Added changes to support new logic classes
Modified Model Classes to use delegation