Random Oracle and other improvements