IDatabase.java added & few fixes