Improve breakdown model and database adapter"