Add missing file, add new entities