Shift from apikey to application