Updated to try and support BM-Dev version (UUID)