- Optimize more for rail optimization (#368)