Update to use magictags