Added remaining related entities in the normalize command.