Add constructor and getters/setters