Updated database as per Issue #16