Improve rail and ports performance