Split up the OnAction method repository to keep it clean and maintainable
Extended tree node + added todo