Added hint support