Next commit: few changes related to database schema.