Feature/3.0.0 assets