Changed to use DatabaseProperties