ECL-146 adding assignments functionality
ECL-146 removing assignments functionality
ECL-146 small fixes