Changed work with options