Added few more settings