Updated to serve, dist and build task