Move module reload to macro function