Add some maybe required selfs.