Improved CUSTOMER SUPPORT functionaity