Changed structure of results for consistency with other functions