Removed TODO and added an issue in tracker for the same