Getting rid of components and mapper update