Added options to some packages