Added simple history mechanism