Add some wrappers to make old scripts work