Switch to only use 1 level of nesting depth