Added basic support for hints
Added more support for rows