#16 added support for non-mapped methods