Added notFound export + reset