Amanda - adding type inference code