Added proper data output