Added Option & State Masks