removed extra context, work with reserved keywords