Added options --with-opccore --with-uamappings