Improve scalability, add alignment customization