Better handling of nested assets