More work for N4 support