Infrastructures View and improved infrastructures support architecture: major refactor; added new tests