Updates according to recent design decisions.