Adding code to handle charges