Moved FilterSource, added UML