Adding auto-start functionality