Adjustments for Spring dependency order