Added initial design time support