Add the rest of the base entities