Use r7 support library