custom setters change as per epitome pr