Added support for assigments