This is an interesting change, should we be changing the implementation of the Hints class?