Updated Customer Management functionality