Add constructor
Modify visibility