Added option defines and mc_token code