renamed constructor annoation and generator