Added block and history controller