Add offsets and nested columns