Added alignment setting and updated parsing