Improve database representation of various types