Functions added with assignment logic