TAP5-1515 : Support for external assets (some code improvements)