Updated to handle differently multiple and single datasets