Feature: added history and options