Added ability to nest fields from multiple streams into a single form