#6

Prepare for DB update