Better configuration model, read configuration from query hints