Handle combination of with and from options + decorator defined method.

Fixes #1