Updated execution order to avoid arbitrary loading order conflicts