Optimize loading and switch to new backend