Added initial version of Option