Adding zone specific options. Needs some work.