Add Controller type
Better numRows() function