Update: Workaround config handling