Add some more hints