Add api mapping, etc