Asset bundling, some model changes