Updated with get/set functions
Updated calss get/set functions