Tweaking database setup