BM - Adding persistant settings