Added few system settings