Replace database drop with find_or_create