Added database initializer, other changes