Add path modification and core module