Added MOA adapters