Added checks to make sure option is not already added