move more options into the options package