Add support for alignment