Init for new arch
Merged upstream