Added option to store yes/no in DB