Some Improvements and Mapping other method not present in tests