Added functions and views