Add moreores compatibility