Added alignment to retrival. Optional flag to disable this behavior