Improve subnesting