Added generic find by method