Improve List support and add Dict support