Added options for startup