Updated modules and sandbox