Some changes for ecmascript6