Better option handling - with null (0) default for alignments