Added N7 support