Adding design-time support

ignore, will remove