Updated flow classes to include official investment