Add history, builtins and hostname check