Added rest stuff and views