Now works with a Derby DB