Added support for result types
Fixed support for numeric types
Updated to new signature