Added comments in TODO