Added support to new arch