Updates for legacy ESP framework