Add history scope, alter design