Added Repository and implemented some new views