yes, I will do this in a future change. that and the change around use of the Bounce object.