More generic asset inclusions. Fixes #95.