Added magic string checking