Update for the last changes.
Adding latest changes.