Added TODO's and fixed API Inconsistancy