Adapted to changed core asset locations