Added fixme and removed serialUID