Restructure FindBy