Updated Constructors and added some getters & setters