Improve database objects