Changes for Derby database