Updated self host