Calendar usage eliminated in Database model class