Moving other things like macros into Generic Storage