Added @Data support