Updated config - extracted account names