Incorporated Rene's feedback
Use bitmask in SMUtils