Made some changes in global Package and TODO's in BaseRail class