Add comment && Add function property for dataSource