Added support for more hints