API Related Issues - Update