Support a module token

support a module token such as module:foo/bar
and improve annotations
Support a module token