Changes to satisfy new API