TODOs should be fullfill in the next commit