refactoring and adding SCL passenger support