Updated for gradle