add class transformer, and few change.