Add Oracle and fix some bugs