Integrated more common types into riftwarp