Mortimer/type inference

Type Inference support ;)