Added dependent options to some models