Some improvements for the Mockup.