Added `align` option to replace the `raw_align` field.