added user attributes and expression checking