Added views and functions