Changes to user expansion