Stricter type for the return value
Use an INT64 for the return value instead
Handle more return types