Feature/db 2.2.4