Settings

Added Settings related changes