Updated documentation and added todo