Simplify the find and create