Several modifications to the alignment object classes