Spring clean up, introduce flexibity and multi assets