diff --git a/SkywardHub.pro b/SkywardHub.pro
index 3c865458a799073062eb88a0a234c450aa6c7311..729f0e14f8e22a9ecffaa07b1457856f8aa744af 100644
--- a/SkywardHub.pro
+++ b/SkywardHub.pro
@@ -17,9 +17,11 @@ SOURCES += \
     Components/ToggleButton/togglebutton.cpp \
     Components/ErrorDisplayer/error.cpp \
     Components/ErrorDisplayer/errordisplayer.cpp \
+    Components/TopicAndFieldSelector/topicandfieldselector.cpp \
     Core/Message/messagefield.cpp \
     Core/Message/modulemessage.cpp \
     Core/Message/topic.cpp \
+    Core/Message/topicandfieldfilter.cpp \
     Core/Message/topicfilter.cpp \
     Core/module.cpp \
     Core/moduleeventshandler.cpp \
@@ -70,9 +72,11 @@ HEADERS += \
     Components/ToggleButton/togglebutton.h \
     Components/ErrorDisplayer/error.h \
     Components/ErrorDisplayer/errordisplayer.h \
+    Components/TopicAndFieldSelector/topicandfieldselector.h \
     Core/Message/messagefield.h \
     Core/Message/modulemessage.h \
     Core/Message/topic.h \
+    Core/Message/topicandfieldfilter.h \
     Core/Message/topicfilter.h \
     Core/module.h \
     Core/moduleeventshandler.h \