Add todo comments not to forget to implement notification