Added db_password and enable_heat options