Updated getter setters