Adding return typing