Better handling of Options

Change-Id: If8e5cde2fda1c8315135a484c16adf7d606f2b13