More work on asset parsing, generalize stage support