Updated Alignment class