added support for assignment tokens