added todo re removing API inconsistencies