Changes to reflect new hints style