Improve type hinting

Change-Id: I49ff9379fce46e1db9a152cad74816e05413d641