Add constructor, fix a property