Add base Filter class and formatting