Changing low-level API to use only basic JDK classes...