Change Link to @Data and other fixes