More work on config parser