Update & fix custom data API