Moved some stuff to base image.