Added Getters, setters and constructors