STS-3599: Better layout, initial support for updates.