Added count param detection for return values