Improved withdrawal endpoint