Adding design-time support