Rework configuration parser