Adapted to new build tools