Refactor assets inclusion