Added command_prompt and historybuffer