More progress on config functions