Updates for Derby 0.5