Updated specs and views