Added Settings related classes