Remove #current
refactor by adding class method #self.find_or_new