Updated paths and core