Updated the class to used property setter