Changes to mockup to better suit js autogeneration