Add advanced finders to w5d1