Added sources, name forms, some places