Design-related changes