Improve db layout