Fix parameter types of expand/collapse methods, fix return type of dataItem method