Add find_or_create function
Fix findAndLoad and collection