Move options to object