Some more work on Assets