Issue197 web core refactor 2