AddOpt functionality - part 1