Extended usage of Assets.
Cleaned up in some imports.