Reverted back to history being a singleton