Updated assets & framework according to new assets