Added list and option normalizing