BS-10698, add missing apis + normalize all keys