Added support for evaluation of different assignments in AssignmentHandler.java