Update to load assets properly