Added setter + getter