Need to fix database stuffs