More rename tokens

From GS

A couple in particular I'd be interested in are %albumartist% & %disc% or %cd% (Disc Number). Another suggestion might be %composer%, I'd never use it but some people might. My ideal naming structure would be "%albumartist%/%album%/%disc%.%track% - %artist% - %title%". Preferably adding an option for it to default to artist if no album artist is found. (Kinda like iTunes, that's the ONLY thing I like about that program).