Adding MOGAMI and ARCH 7x30 support