Added design time support