Added more rail functionality