DB lab#1. Some generator improvements