Adjustments to new API