Fiber switch

Hello, We are starting to use Peplink Switches for our cloud-based clients and are really happy so far. What are you doing for fiber switches? Any plans for a say 24 and 8 port fiber switch options? Many of our projects have multiple IDFs aggregated via fiber to an MDF.