Move asset retrieval into asset ns
Robustify macro requirements