Database working great, added options