Fix Setting class and add Class Props