Update interfaces
Update self reference logic