Added views (Refactor)