Added getters and setters, removed constructor overloading