Added stringify where needed