A bit of bug fixing, the recursive metadata parsing will need some adjustment