feat(Alignment): Alignment patches