More nestable + config changes