Added TODO about modularity