Added headless feature