How to add a subdirectory name to an image field

I'm using an image field and I can specify a directory to store those image files. I would like to specify a subdirectory specific to every node so my pictures won't get saved in a single directory.

With the token module I can specify something like directory/[current-page:page-number]. This always return "1". I tried other query strings like [current-page:url:args:value:2] but this will not work at node creation, only when I modify it.

Can this be achieved with tokens?