Added views and rename type