improve Assets more flexible
fix assets