Database mod improved