Extend the TODO applications by the following: