Added arguments to scan, query in Model