More changes for new code gneration