Updated to work with latest Rajawali changes.