[WIP] Added find_by_name