Added a functionality to see find or create