Changed setters and getter