Added TODOs in order to fix implementation