ADD and FILTER functionality added