Replaced specific findby'x' methods with general find method