fixed current issues by using LocalCollection