Started adding filter options