Update self function calls