Added third rail support