More implementation of Openandromapas support.