Adding design-time support

I'm not against this, but it may make merging "upstream" changes harder (not sure if we care)