Updated instance to not store it when it's not in use