Replace #getOrCreate with separate calls to #get and #create

Add comments