Update Whitelist handler for new API