Add remaining entities from vanilla.