Add hints for data constructors