add context dependency, fix fields and views