Refactor createORFind to create